Link against the packaged version of libpcre2

Instead of the code copy.

Gbp-Pq: Name packaged_libpcre2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2dddcfb121755c6f282d905cab419fd95891a2a5..41346026c6fbe1108661d8bc9f3ea4aadde23447 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 set(CMAKE_C_STANDARD 99)
 
-set(PCRE2_INCLUDE_DIR ${CMAKE_BINARY_DIR}/src/libpcre2/interface)
+set(PCRE2_INCLUDE_DIR /usr/include)
 set(CYTHON_EXTRA_COMPILE_ARGS -DPCRE2_CODE_UNIT_WIDTH=8 -fPIC)
 
 # Set PCRE2 options.
@@ -15,11 +15,6 @@ set(PCRE2_NEVER_BACKSLASH_C ON CACHE BOOL "" FORCE)
 # Always make a release build.
 set(CMAKE_BUILD_TYPE Release)
 
-# Build PCRE2 library as both shared and static.
-set(BUILD_STATIC_LIBS ON)
-set(BUILD_SHARED_LIBS ON)
-add_subdirectory(src/libpcre2)
-
 # Build Cython code as shared.
 set(BUILD_STATIC_LIBS OFF)
 set(BUILD_SHARED_LIBS ON)

diff --git a/src/pcre2/CMakeLists.txt b/src/pcre2/CMakeLists.txt
index 9508aee9a8363b4bcebb8e5dc5ef89f71ddb9265..4ffd63b904d40e4e307c602b991fd8eb2d54b5a1 100644 (file)
--- a/src/pcre2/CMakeLists.txt
+++ b/src/pcre2/CMakeLists.txt
@@ -12,7 +12,7 @@ macro(add_pyx_file filename)
     add_library(${filename} MODULE ${filename})
     python_extension_module(${filename})
 
-    target_link_libraries(${filename} pcre2-8-static)
+    target_link_libraries(${filename} pcre2-8)
     target_include_directories(${filename} PRIVATE ${PCRE2_INCLUDE_DIR})
     target_compile_options(${filename} PRIVATE ${CYTHON_EXTRA_COMPILE_ARGS})